Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sat, 30 Jan 2010 13:50:39 +0000 (08:50 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 30 Jan 2010 13:50:39 +0000 (08:50 -0500)
commit81199b8283c591edeec73b879c54dda013e1906b
tree2bbb2bab20632fc2d0170d355ec1eaa651b32278
parent341389a459425c821c3a48f1b73bec4fbb5b71fb
parente98710a8735b3ce1172b948e84bc6709a045c6ab
Merge from mainline.